Fixed code for unit tests closes #66. Passing 21 tests; failing 2 for Shops and Stories