fix order of model definitions
Fix tests
remove console.log
demo scenario works
Merge branch 'afsin'