Update of tests and XMIHelper according to new return type of Loader
Merge remote-tracking branch 'refs/remotes/origin/master'