Done some code clean up of unit tests to match @shoulds

Done some code clean up of unit tests to match @shoulds