Removed  from constructor
Completed writing tests