updated all specs to use Factory Girl simplified syntax