Refactoring of unix test script
ui: removed a lot of unused code