COmpleted writing tests. 
All tests green :)