--- a/tests/src/addCollectionAdmin.test.ts
+++ b/tests/src/addCollectionAdmin.test.ts
@@ -37,7 +37,7 @@
       const {collectionId} = await helper.nft.mintCollection(alice, {name: 'Collection Name', description: 'Collection Description', tokenPrefix: 'COL'});
 
       const collection = await helper.collection.getData(collectionId);
-      expect(collection?.normalizedOwner!).to.be.equal(alice.address);
+      expect(collection!.normalizedOwner!).to.be.equal(alice.address);
 
       await helper.nft.addAdmin(alice, collectionId, {Substrate: bob.address});
 
--- a/tests/src/util/playgrounds/unique.dev.ts
+++ b/tests/src/util/playgrounds/unique.dev.ts
@@ -12,11 +12,11 @@
   /**
    * Arrange methods for tests
    */
-  arrange: UniqueArrange;
+  arrange: ArrangeGroup;
 
   constructor(logger: { log: (msg: any, level: any) => void, level: any }) {
     super(logger);
-    this.arrange = new UniqueArrange(this);
+    this.arrange = new ArrangeGroup(this);
   }
 
   async connect(wsEndpoint: string, listeners?: any): Promise<void> {
@@ -55,7 +55,7 @@
   }
 }
 
-class UniqueArrange {
+class ArrangeGroup {
   helper: UniqueHelper;
 
   constructor(helper: UniqueHelper) {