Fix-ish recent test alignment