Update to test to pull out abstract base classes for model beans.