Refactored as per Bob Kata after Test 2 has passed