Refactoring tests to be more simple