Minor test script tweaks.