Mewan, Vinod | #2325 | Refactoring tests, more validations