Refactor integration tests
Merge pull request #4 from pmorie/build

Refactor integration tests