diff --git a/test/aeso_compiler_tests.erl b/test/aeso_compiler_tests.erl
index 7d630ec..56d1c42 100644
--- a/test/aeso_compiler_tests.erl
+++ b/test/aeso_compiler_tests.erl
@@ -814,8 +814,6 @@ failing_contracts() ->
                      "The type variable `'b` is constrained but never used">>,
                    <<?Pos(29,41)
                      "Unknown constraint `foo` used on the type variable `'a`">>,
-                   <<?Pos(60,56)
-                     "Values of type `address` are not comparable by inequality">>,
                    <<?Pos(63,58)
                      "Values of type `Chain.ttl` are not comparable by inequality">>,
                    <<?Pos(66,45)
@@ -824,14 +822,14 @@ failing_contracts() ->
                      "Values of type `(int, char) => bool` are not comparable by inequality">>,
                    <<?Pos(74,47)
                      "Values of type `(int, char) => bool` are not comparable by equality">>,
-                   <<?Pos(89,71)
-                     "Values of type `list(address)` are not comparable by inequality">>,
-                   <<?Pos(92,77)
-                     "Values of type `option(address)` are not comparable by inequality">>,
-                   <<?Pos(95,76)
-                     "Values of type `(address * int)` are not comparable by inequality">>,
-                   <<?Pos(96,76)
-                     "Values of type `(address * int)` are not comparable by equality">>,
+                   <<?Pos(89,59)
+                     "Values of type `list(A)` are not comparable by inequality">>,
+                   <<?Pos(92,65)
+                     "Values of type `option(A)` are not comparable by inequality">>,
+                   <<?Pos(95,64)
+                     "Values of type `(A * int)` are not comparable by inequality">>,
+                   <<?Pos(96,64)
+                     "Values of type `(A * int)` are not comparable by equality">>,
                    <<?Pos(100,68)
                      "Values of type `list((int, char) => bool)` are not comparable by inequality">>,
                    <<?Pos(101,68)
@@ -854,16 +852,16 @@ failing_contracts() ->
                      "Values of type `custom_datatype(int)` are not comparable by inequality">>,
                    <<?Pos(123,84)
                      "Values of type `custom_record(int)` are not comparable by inequality">>,
-                   <<?Pos(128,86)
-                     "Values of type `map(address, address)` are not comparable by inequality">>,
-                   <<?Pos(131,95)
-                     "Values of type `oracle(address, address)` are not comparable by inequality">>,
-                   <<?Pos(134,113)
-                     "Values of type `oracle_query(address, address)` are not comparable by inequality">>,
-                   <<?Pos(137,97)
-                     "Values of type `custom_datatype(address)` are not comparable by inequality">>,
-                   <<?Pos(140,91)
-                     "Values of type `custom_record(address)` are not comparable by inequality">>,
+                   <<?Pos(128,62)
+                     "Values of type `map(A, A)` are not comparable by inequality">>,
+                   <<?Pos(131,71)
+                     "Values of type `oracle(A, A)` are not comparable by inequality">>,
+                   <<?Pos(134,89)
+                     "Values of type `oracle_query(A, A)` are not comparable by inequality">>,
+                   <<?Pos(137,85)
+                     "Values of type `custom_datatype(A)` are not comparable by inequality">>,
+                   <<?Pos(140,79)
+                     "Values of type `custom_record(A)` are not comparable by inequality">>,
                    <<?Pos(145,75)
                      "Values of type `map((int, char) => bool, (int, char) => bool)` are not comparable by inequality">>,
                    <<?Pos(146,75)
diff --git a/test/contracts/comparable_typevar_constraints.aes b/test/contracts/comparable_typevar_constraints.aes
index 852ab5a..b87fce7 100644
--- a/test/contracts/comparable_typevar_constraints.aes
+++ b/test/contracts/comparable_typevar_constraints.aes
@@ -55,11 +55,11 @@ main contract C =
     function signature_ord(x : signature, y : signature) = x >= y  // pass
     function signature_eq (x : signature, y : signature) = x == y  // pass
 
-    // Eq types
-
-    function address_ord(x : address, y : address) = x >= y  // fail
+    function address_ord(x : address, y : address) = x >= y  // pass
     function address_eq (x : address, y : address) = x == y  // pass
 
+    // Eq types
+
     function event_ord(x : Chain.ttl, y : Chain.ttl) = x >= y  // fail
     function event_eq (x : Chain.ttl, y : Chain.ttl) = x == y  // pass
 
@@ -86,14 +86,14 @@ main contract C =
 
     // Ord composite types of eq
 
-    function list_of_eq_ord(x : list(address), y : list(address)) = x >= y  // fail
-    function list_of_eq_eq (x : list(address), y : list(address)) = x == y  // pass
+    function list_of_eq_ord(x : list(A), y : list(A)) = x >= y  // fail
+    function list_of_eq_eq (x : list(A), y : list(A)) = x == y  // pass
 
-    function option_of_eq_ord(x : option(address), y : option(address)) = x >= y  // fail
-    function option_of_eq_eq (x : option(address), y : option(address)) = x == y  // pass
+    function option_of_eq_ord(x : option(A), y : option(A)) = x >= y  // fail
+    function option_of_eq_eq (x : option(A), y : option(A)) = x == y  // pass
 
-    function tuple_of_eq_ord(x : (address * int), y : (address * int)) = x >= y  // fail
-    function tuple_of_eq_eq (x : (address * int), y : (address * int)) = x == y  // pass
+    function tuple_of_eq_ord(x : (A * int), y : (A * int)) = x >= y  // fail
+    function tuple_of_eq_eq (x : (A * int), y : (A * int)) = x == y  // pass
 
     // Ord composite types of nomcomparable
 
@@ -125,20 +125,20 @@ main contract C =
 
     // Eq composite types of eq
 
-    function map_of_eq_ord(x : map(address, address), y : map(address, address)) = x >= y  // fail
-    function map_of_eq_eq (x : map(address, address), y : map(address, address)) = x == y  // pass
+    function map_of_eq_ord(x : map(A, A), y : map(A, A)) = x >= y  // fail
+    function map_of_eq_eq (x : map(A, A), y : map(A, A)) = x == y  // pass
 
-    function oracle_of_eq_ord(x : oracle(address, address), y : oracle(address, address)) = x >= y  // fail
-    function oracle_of_eq_eq (x : oracle(address, address), y : oracle(address, address)) = x == y  // pass
+    function oracle_of_eq_ord(x : oracle(A, A), y : oracle(A, A)) = x >= y  // fail
+    function oracle_of_eq_eq (x : oracle(A, A), y : oracle(A, A)) = x == y  // pass
 
-    function oracle_query_of_eq_ord(x : oracle_query(address, address), y : oracle_query(address, address)) = x >= y  // fail
-    function oracle_query_of_eq_eq (x : oracle_query(address, address), y : oracle_query(address, address)) = x == y  // pass
+    function oracle_query_of_eq_ord(x : oracle_query(A, A), y : oracle_query(A, A)) = x >= y  // fail
+    function oracle_query_of_eq_eq (x : oracle_query(A, A), y : oracle_query(A, A)) = x == y  // pass
 
-    function datatype_of_eq_ord(x : custom_datatype(address), y : custom_datatype(address)) = x >= y  // fail
-    function datatype_of_eq_eq (x : custom_datatype(address), y : custom_datatype(address)) = x == y  // pass
+    function datatype_of_eq_ord(x : custom_datatype(A), y : custom_datatype(A)) = x >= y  // fail
+    function datatype_of_eq_eq (x : custom_datatype(A), y : custom_datatype(A)) = x == y  // pass
 
-    function record_of_eq_ord(x : custom_record(address), y : custom_record(address)) = x >= y  // fail
-    function record_of_eq_eq (x : custom_record(address), y : custom_record(address)) = x == y  // pass
+    function record_of_eq_ord(x : custom_record(A), y : custom_record(A)) = x >= y  // fail
+    function record_of_eq_eq (x : custom_record(A), y : custom_record(A)) = x == y  // pass
 
     // Eq composite types of nomcomparable