Modified test script generators...probably need to rebase soon before forking