Add more tests and fixes for the test failures