GPII-20: commiting for yura to look at
GPII-20: udpated middleware to not break the integration tests.
GPII-20: Cleaned up integrationTesting... all tests are now passing