Improve launcher script and xtr test cases