Minor changes to the tests
Fix absolutely idiotic bug
Fix