adding cache and nock cleanups to the integration tests
unit tests.  refactor IF statement to make it more readable.  remove commentary for an unneeded story