Fixed rspec errors due to refactoring.