Some more test fixes

[sorry I somehow got this tapkee stuff instide here.]

made unit-tests quite and changes slightly
added new test for evaluation_clustering and integration test