Merge "Improve data separation test coverage"