Affinity Facet automatically created. Fixed all the tests that blew up.