Updated rails version and refactored a bunch of specs