diff --git a/persistence/mock_album_repo.go b/persistence/mock_album_repo.go
index a012978f..1097fa6b 100644
--- a/persistence/mock_album_repo.go
+++ b/persistence/mock_album_repo.go
@@ -51,8 +51,10 @@ func (m *MockAlbum) Get(id string) (*domain.Album, error) {
 	return nil, domain.ErrNotFound
 }
 
-func (m *MockAlbum) GetAll(qo domain.QueryOptions) (domain.Albums, error) {
-	m.Options = qo
+func (m *MockAlbum) GetAll(qo ...domain.QueryOptions) (domain.Albums, error) {
+	if len(qo) > 0 {
+		m.Options = qo[0]
+	}
 	if m.err {
 		return nil, errors.New("Error!")
 	}
@@ -74,3 +76,5 @@ func (m *MockAlbum) FindByArtist(artistId string) (domain.Albums, error) {
 
 	return res, nil
 }
+
+var _ domain.AlbumRepository = (*MockAlbum)(nil)
diff --git a/persistence/mock_artist_repo.go b/persistence/mock_artist_repo.go
index 7906c3af..e69527ff 100644
--- a/persistence/mock_artist_repo.go
+++ b/persistence/mock_artist_repo.go
@@ -48,3 +48,5 @@ func (m *MockArtist) Get(id string) (*domain.Artist, error) {
 	}
 	return nil, domain.ErrNotFound
 }
+
+var _ domain.ArtistRepository = (*MockArtist)(nil)
diff --git a/persistence/mock_index_repo.go b/persistence/mock_index_repo.go
index 81672efa..e997a210 100644
--- a/persistence/mock_index_repo.go
+++ b/persistence/mock_index_repo.go
@@ -36,3 +36,5 @@ func (m *MockArtistIndex) GetAll() (domain.ArtistIndexes, error) {
 	}
 	return m.data, nil
 }
+
+var _ domain.ArtistIndexRepository = (*MockArtistIndex)(nil)
diff --git a/persistence/mock_mediafile_repo.go b/persistence/mock_mediafile_repo.go
index 167274e8..99e64a3d 100644
--- a/persistence/mock_mediafile_repo.go
+++ b/persistence/mock_mediafile_repo.go
@@ -67,3 +67,5 @@ func (m *MockMediaFile) FindByAlbum(artistId string) (domain.MediaFiles, error)
 
 	return res, nil
 }
+
+var _ domain.MediaFileRepository = (*MockMediaFile)(nil)