Merge "Update builds in pkg tests"