More improvement, almost all tests are passing now