Fixed integration tests.  #15

Worked on fixing integration test cases.