Merge "Remove unused member and fix tests" into main