Test fix in progress