Fixed tests

...hopefully