Updating test script to clean up