Finished up TDD work