fixed a few more tests