Fix other failing tests