add more tests
Merge branch 'configurableModel' into 1.6.x