Classmap updated
Updated the code
Added all the tests