DEVIDM-50: Fixed broken test, global mock issue.
Merge pull request #70 from tomma/DEVIDM-50

DEVIDM-50: Fixed broken test, global mock issue.