refactored tests to aid readability