Adapt unit test based on the new proper fail system