Move tests around to match the directory structure of Rails 4 tests