Actually fix tests.
Write tests in a better way