Made integration test more comprehensive