Improve tester script