refactored tests for readability