Fixed integration tests.
Merge pull request #1 from scottfrederick/forScott

Fixed integration tests.