Refactored the tests even more