[Validator] Fix/Extend CardSchemeValidator & extend tests