fixes more tests