More test fixes

All tests passing! (Note: simplecov test coverage is deceivingly high) :horse: