Merge pull request #104 from unwin/develop

consistency change from name to id for comparisons.
Cleaned up before/after methods after listInternetGateway test was
removed.