Fix exception showing during test + mock configuration dependencies
Merge branch 'master' of github.com:nenadalm/Train