Merge "Remove unneeded test" into main