Fixed failing integration tests.
Merge pull request #89 from scottfrederick/int-test

Fixed failing integration tests.