Fix tests [MJ-448]