original version of the test-classes. (dont't compile any more)
correct packages
made test cases at least compile again. Had to comment out a lot, and many are failing too