Refactored tests for better legibility