Fixed the errors that were caused by the validation changes.  Now running rake test will yield no errors.