Change base tests based on refactoring of code.
Add happy-path tests for age.