further fixes to sync all integration tests