Merge "Fix & ignore some tests" into main