GPII-20: simplified integration testing file.
Merge pull request #2 from yzen/GPII-20

GPII-20: Merging Yuras suggestions