FORGE-1686: Reverted test changes