fixing more integration tests