in process fixing currently failing tests on rake test:all