reorganize test files to enable Benchmark'ing
finish test files reorg
add Benchmark's (lots of test output, interesting results)