- fixes more tests