use cleaned models
Merge branch 'fix_test_models'

* fix_test_models:
  use cleaned models