Fixed tests

Hopefully the tests suite will be green again