Fix TestSuite completely for Rails4