Cleaned up TestModel