Working on refactoring the tests