Merge "Minor fixes and adding unit testing for validators"