Fix tests [MJ-931]