CMS-4421 Data V2 - Secure Data2 classes properly with unit-test