fixed a couple more tests