Merge "Remove unused test dependencies" into main