Minor changes
Some tests for base gateway class
Missing changeset in last commit added