Fix and update tests for sapphire.esd