Updated factories for compatibility with newest Factory Girl
Updated validates snippet to use new hash syntax