Refs #2001: gateway info removed & added a unit test module