responding to review feedback, add tests, fix the tests that were there but didn't run