Fixes bug with model listeners not being set in time
Fixes issue with tests
Merge pull request #389 from adaptlearning/issue/#388

Issue/#388