Started working on tests and fixing things so tests pass
Finished helper specs