Testcases refactored, bugs fixed
Merge branch 'master' of https://github.com/pi13/sw14_free_07.git