fixed a bit more tests.