EZP-22210: Integrated Mockery
EZP-22210: Fixed LegacyBundles unit tests