Fixed issues with Evaluation rspec tests