More test script changes
Merge branch 'master' of https://github.com/labyrintrobot/labyrintrobot