Add test for proper return value.
Refactor.  Add note for next step.