Fixed failing tests following previous changes.