[WO-554] Fix tests