Fixed integration tests
Merge pull request #54 from bpross-52n/master

Fixed integration tests