Fix model instance "name" in model tests
Unified property-bound functions and models with state functions