EZP-20321: Changed LegacyTest a bit to please DFS