Fix validator coverage
Style and typo fixes
Fixed validator test