Enhancing OOP, TDD and SUR Skill set