Revert validation changes that broke tests.

validates is used instead of validates_presence_of because validates
accepts more options and is the preferred method in Rails 3.