Improve tesmunk script