#126 improve scripting for the tests