- extended testsuite

Yes, there are intentionally some FIXMEs.
OK, if it is just two files, it is not so horrible, if another file is added, it is worth to consider it.