Updating Copyright, Small test refactor.
Refactoring integartion tests.
Refactoring integration tests.
Refactoring integration tests.
Refactoring integration tests.
Refactoring integration tests.
Refactoring integration tests.
Refactoring integration tests.