new testcases + testcase timings + more refactoring