test framework changed  and some bugfixes