Refactored API matchers
Use supported method of handling DataMapper with FactoryGirl