fixed more tests.