further tidy up of TDD work