Now passing all tests in rails 4.1.1