Get tests passing with new tests
Update for submission 5 per http://exercism.io/submissions/52028d3b75d94d4cc20000e4