cleaning up and refactoring tests to look prettier