refactor integrated testing
Merge pull request #12 from metridoc/cleanup-integ-tests

refactor integrated testing