Now have all factories, lib/models, and instantiation tests working for all 4 models.