Update scripts and tests