Adding more hasVariant predicates. Updating model, fixtures and rspec tests. DHH-164