integration testing fixes