Removed:
-unused Testclassses
-IBM Copyrigths 
-TODO Comment