[nova] Backporting test refactors to stable/train