Add tests for modifying original test
Refactor by simplifying returns