Removed unneeded classes and fix a few tests