Gateway-3387:Unit Test added