Corrected model errors which were raised after test execution
Merge remote-tracking branch 'origin/master'