Merge "Remove old unused tests" into main