diff --git a/ql/test/library-tests/semmle/go/Scopes/MethodImplements.expected b/ql/test/library-tests/semmle/go/Scopes/MethodImplements.expected
index acafedf6428..8edc2f2a211 100644
--- a/ql/test/library-tests/semmle/go/Scopes/MethodImplements.expected
+++ b/ql/test/library-tests/semmle/go/Scopes/MethodImplements.expected
@@ -1,15 +1,15 @@
+| * starImpl | meth1 | * starImpl | meth1 |
+| * starImpl | meth1 | meth1Iface | meth1 |
+| * starImpl | meth1 | twoMethods | meth1 |
+| * t | bump | * t | bump |
+| * t | meth | * t | meth |
+| * t | meth | iHaveAMethod | meth |
+| * t | meth | iHaveARedeclaredMethod | meth |
 | iHaveAMethod | meth | iHaveAMethod | meth |
 | iHaveARedeclaredMethod | meth | iHaveARedeclaredMethod | meth |
 | meth1Iface | meth1 | meth1Iface | meth1 |
 | notImpl | meth1 | notImpl | meth1 |
 | notImpl | meth2 | notImpl | meth2 |
-| pointer type | bump | pointer type | bump |
-| pointer type | meth | iHaveAMethod | meth |
-| pointer type | meth | iHaveARedeclaredMethod | meth |
-| pointer type | meth | pointer type | meth |
-| pointer type | meth1 | meth1Iface | meth1 |
-| pointer type | meth1 | pointer type | meth1 |
-| pointer type | meth1 | twoMethods | meth1 |
 | starImpl | meth2 | starImpl | meth2 |
 | starImpl | meth2 | twoMethods | meth2 |
 | twoMethods | meth1 | twoMethods | meth1 |
diff --git a/ql/test/library-tests/semmle/go/Scopes/MethodImplements.ql b/ql/test/library-tests/semmle/go/Scopes/MethodImplements.ql
index 7def17705e0..eefc289dde5 100644
--- a/ql/test/library-tests/semmle/go/Scopes/MethodImplements.ql
+++ b/ql/test/library-tests/semmle/go/Scopes/MethodImplements.ql
@@ -2,4 +2,4 @@ import go
 
 from Method m, Method im
 where m.implements(im) and m.getPackage().getName() = "main"
-select m.getReceiverType(), m.getName(), im.getReceiverType(), im.getName()
+select m.getReceiverType().pp(), m.getName(), im.getReceiverType().pp(), im.getName()
diff --git a/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.expected b/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.expected
index 05b655129ae..021111a44f3 100644
--- a/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.expected
+++ b/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.expected
@@ -1,17 +1,17 @@
+| * starImpl | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | meth1Iface | meth1 |
+| * starImpl | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | starImpl | meth1 |
+| * starImpl | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | twoMethods | meth1 |
+| * starImpl | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | twoMethodsEmbedded | meth1 |
+| * t | bump | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | t | bump |
+| * t | meth | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | iHaveAMethod | meth |
+| * t | meth | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | iHaveARedeclaredMethod | meth |
+| * t | meth | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | t | meth |
 | iHaveAMethod | meth | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | iHaveAMethod | meth |
 | iHaveARedeclaredMethod | meth | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | iHaveARedeclaredMethod | meth |
 | meth1Iface | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | meth1Iface | meth1 |
 | meth1Iface | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | twoMethodsEmbedded | meth1 |
 | notImpl | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | notImpl | meth1 |
 | notImpl | meth2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | notImpl | meth2 |
-| pointer type | bump | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | t | bump |
-| pointer type | meth | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | iHaveAMethod | meth |
-| pointer type | meth | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | iHaveARedeclaredMethod | meth |
-| pointer type | meth | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | t | meth |
-| pointer type | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | meth1Iface | meth1 |
-| pointer type | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | starImpl | meth1 |
-| pointer type | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | twoMethods | meth1 |
-| pointer type | meth1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | twoMethodsEmbedded | meth1 |
 | starImpl | meth2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | starImpl | meth2 |
 | starImpl | meth2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | twoMethods | meth2 |
 | starImpl | meth2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes | twoMethodsEmbedded | meth2 |
diff --git a/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.ql b/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.ql
index 6b688522c2d..d8ad9ee4122 100644
--- a/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.ql
+++ b/ql/test/library-tests/semmle/go/Scopes/MethodImplementsName.ql
@@ -4,4 +4,4 @@ from Method m, string pkg, string tp, string name
 where
   m.implements(pkg, tp, name) and
   m.hasQualifiedName("github.com/github/codeql-go/ql/test/library-tests/semmle/go/Scopes", _, _)
-select m.getReceiverType(), m.getName(), pkg, tp, name
+select m.getReceiverType().pp(), m.getName(), pkg, tp, name