Integration test update
Merged with MH
fixed minor compiler warnings in tests
trying to fix integration tests