Fixed integration tests.
Merge pull request #92 from avasquez614/master

Fixed integration tests