Attempting to clean up tests so they pass. WIP.
Merge branch 'master' of github.com:JavaPosseRoundup/hungry-hippo