Add another input data validator & its test with refactoring of old one