Some cleanup and fixes of integration tests