Fix unit tests based on new PROD data