Merge "Remove BaseComputeTest and _api_version"