added testing-suite, restructed some things, work not finally done