Adjustments on Gateway methods and tests class