Fixed failing test due to FORGE-2004