Fixing some integration tests