Improving Project to Teach OOD and TDD