fixed a lot of tests