Cleaned test script up