merged two repositories and added TDD code