Improving tst and fixing issue #20 (again)