Updated to 1.2 and fixed tests

You made some incremental changes but the tests failed. Here are the fixes to update your pull request on the main repo.