integrated integration tests
cleanup
Merge pull request #50 from hayes/integrate

integrated integration tests