fixed a bunch more tests