Refactored for Test 2