Clean up integration tests
Merge pull request #15 from gaye/cleanup-integration-tests

Clean up integration tests