More test cleanup in GO = long Tpetra build.