All Test created, First step in the solution.
First solution refactos, still one red test.