Remove obsolete code
Update test to reflect additional hints generated
Update test to reflect use of different property ordering strategy by default
Remove static models to prevent dependency on test ordering