diff --git a/backend/src/album/album.controller.spec.ts b/backend/src/album/album.controller.spec.ts
index 7648bfa..5543a29 100644
--- a/backend/src/album/album.controller.spec.ts
+++ b/backend/src/album/album.controller.spec.ts
@@ -3,11 +3,14 @@ import { getRepositoryToken } from '@nestjs/typeorm';
 import { AlbumController } from './album.controller';
 import { AlbumService } from './album.service';
 import { Album } from './album.entity';
+import { Repository } from 'typeorm';
 
 const mockAlbum = new Album();
 
 describe('AlbumController', () => {
   let controller: AlbumController;
+  let service: AlbumService;
+  let repository: Repository<Album>;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
@@ -17,8 +20,8 @@ describe('AlbumController', () => {
         {
           provide: getRepositoryToken(Album),
           useValue: {
-            findAll: jest.fn().mockResolvedValue([mockAlbum]),
-            findOneById: jest.fn().mockResolvedValue(mockAlbum),
+            find: jest.fn().mockResolvedValue([mockAlbum]),
+            findOne: jest.fn().mockResolvedValue(mockAlbum),
             create: jest.fn().mockResolvedValue(1),
             update: jest.fn().mockResolvedValue("Album updated successfully"),
             remove: jest.fn().mockResolvedValue(null),
@@ -28,9 +31,23 @@ describe('AlbumController', () => {
     }).compile();
 
     controller = module.get<AlbumController>(AlbumController);
+    service = module.get<AlbumService>(AlbumService);
+    repository = module.get<Repository<Album>>(getRepositoryToken(Album));
   });
 
   it('should be defined', () => {
     expect(controller).toBeDefined();
   });
+
+  describe('findAll', () => {
+    it('should return an array of Albums', async () => {
+      expect(await service.findAll()).toStrictEqual([mockAlbum]);
+    })
+  })
+
+  describe('findOneById', () => {
+    it('should return an Album', async () => {
+      expect(await service.findOneById(1)).toStrictEqual(mockAlbum);
+    })
+  })
 });
diff --git a/frontend/src/app/album/[id]/page.tsx b/frontend/src/app/album/[id]/page.tsx
index 585f7d0..4331077 100644
--- a/frontend/src/app/album/[id]/page.tsx
+++ b/frontend/src/app/album/[id]/page.tsx
@@ -46,7 +46,7 @@ export default function Page() {
 
     const formData = new FormData(event.currentTarget);
     try {
-      if (StringUtils.isBlank(formData.get('id') as string)) {
+      if (formData.get('id') == "") {
         const data = await createSong(formData);
         console.log(data);
       } else {
diff --git a/frontend/src/app/album/page.tsx b/frontend/src/app/album/page.tsx
index 7dabae0..1290e5d 100644
--- a/frontend/src/app/album/page.tsx
+++ b/frontend/src/app/album/page.tsx
@@ -40,7 +40,7 @@ export default function Page() {
 
     const formData = new FormData(event.currentTarget);
     try {
-      if (StringUtils.isBlank(formData.get('id') as string)) {
+      if (formData.get('id') == "") {
         const data = await createAlbum(formData);
         console.log(data);
       } else {