Merge "Remove incorrect package check in test override" into main