MDL-59057 analytics: Unit test fixes