update
More testing.
Move to base class for model tests.