Merge "CursorInputMapper: tidy up the tests" into main