Merge "Adjust more insets related tests for refactor" into main