- extended testsuite

Yes, there are intentionally some FIXMEs.
I agree that we should avoid to much logic in test, but I see that at least "test" method is same. Also main method is identical.