Really fix test suite for rspec 3 / rails 4