reordered test cases and other fixes
Merge branch 'master' of https://github.com/kpro-gr10/report