Cleaning test files

Still not passing, but now following Rails 4 conventions.

One day we shall make them pass.