Removed unneeded classes. Updated test names.