#126 improve test scripting