try to unify Testbase and testbase2 (make testbase2 look like testbase2). This commit leaves stuff unstable. But its a good start to remove testbsae and replace it by testbase2. The changes from the previous commit are valid and usable