simplify and update rails tests
add rails 4.1