Fixed rspec issues that were failing on TravisCi