Clean up of Test scripts