tidy up and a few tests after falling off the TDD wagon