test fixing and survey model update
Merge branch 'test_fixing'