Fix integration tests which failed validation