Fixed integration testing issues.