Updates to test utility
Finished up test script