Refactor tests for clarity