Fixed some bugs amd created test classes for colidate classes