fixed even more tests