still more tests to fix