Fixed some more tests

But I didn't actually run them because bundle install && bundle exec
rake test doesn't give me any results but undefined method errors. >:(