Tries another approach to generalizing test. Expands options in scripts for clarity.