Various updates to scripts and tests.