2.1.1

 * Fix the failing tests (Raymond Feng)