- register correct testcase classes
- remove obsolete helper method in testcase
- rewrite test method to be more explicit
- fix file headers