Merge pull request #494 from ayushchd/unit_testing

UTs:  fixes and improvements
Validator names fix