Cleanup code. Move to ModelTests Base