Added more unittests and cleaning the project.