Test fixed
Validation of gateway param added, Help Messages