TODO "optimize": Done

Suffix checking easier and more efficient.

I also fixed some unittests some others that triggered I disabled (Soenke please review).