Minor modifications to Integration Tests