get more test working or clearly comment out tests in suite
fix naming for inner classes #158
fix #156
cherry picked commit 569b812 of PR #149 and adjusted mock-testcase