Updated some unit tests and class files

Updated some files in order to get all the classes with the respective changes from the last commit