Modifyed source files of project
Added new tests