DEVIDM-98: Adjusted test to flow.
Merge pull request #110 from iceglow/DEVIDM-98

DEVIDM-98: Adjusted test to flow.