Fix up test script a bit