Fix tests [MJ-710]