Re-swizzle verify test scripts