Fixed the tests to make sure they passed before updating to Rails 4