Address failing tests