added adopter adoption criteria

added model attribs for adoption criteria
adjusted test data generation to include adoption criteria