fix some failing tests