Merge "Cleanup displaylib tests" into main