Solving test suite, general cleaning out ...