Cleanup loading failure; Add to test demo
Merge branch 'regressions' of github.com:Connexions/atc into regressions