diff --git a/src/nameservice-expiry.test.ts b/src/nameservice-expiry.test.ts
index 4fd4536..20bb30f 100644
--- a/src/nameservice-expiry.test.ts
+++ b/src/nameservice-expiry.test.ts
@@ -40,7 +40,7 @@ const nameserviceExpiryTests = () => {
       fee
     )
     console.log("SetRecordResult: " + result.data.id)
-    const [record] = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
+    const [record] = await registry.queryRecords({ "type---": watcher.record.type, "version---": watcher.record.version }, true);
     recordExpiryTime = new Date(record.expiryTime);
 
     const [bond] = await registry.getBondsByIds([bondId]);
@@ -63,7 +63,7 @@ const nameserviceExpiryTests = () => {
   });
 
   test('Check record expiry time', async() => {
-    const [record] = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
+    const [record] = await registry.queryRecords({ "type---": watcher.record.type, "version---": watcher.record.version }, true);
     const updatedExpiryTime = new Date();
     expect(updatedExpiryTime.getTime()).toBeGreaterThan(recordExpiryTime.getTime());
     recordExpiryTime = updatedExpiryTime;
@@ -88,7 +88,7 @@ const nameserviceExpiryTests = () => {
   });
 
   test('Check record deleted without bond balance', async() => {
-    const records = await registry.queryRecords({ type: 'WebsiteRegistrationRecord', version: watcher.record.version }, true);
+    const records = await registry.queryRecords({ "type---": watcher.record.type, "version---": watcher.record.version }, true);
     expect(records).toHaveLength(0);
   })