OZP-57: Fixing testacular crash