major refactor to improve/stabalize integration tests
Merge pull request #54 from askmyc/2.1

major refactor to improve/stabilize integration tests