Working on integartion test refactoring.
Refactoring integration tests.
Refactoring integration tests.