Cucumber Tests on top of TDD and other improvements like cucumber hooks, Class absraction etc