Update shoulda-matchers
Update EvaluationController specs, remove commented-out code