Merge "Ignore two failing tests" into main