CLITest coverage >90%
Merge branch 'kehitys' of github.com:jllang/jojoriot into kehitys