Merging and renaming of classes and improvements in tests