Added a few unit tests and deleted some useless classes in the project, which are not used any more