Fixed failing tests based on recent updates