Deleted some wrong Files and updated testclasses.