FORGE-2055: improved tests