WCM-77 Fix Analytics Tests