diff --git a/conf/inject_definitions.go b/conf/inject_definitions.go
index 8e13b1f1a..eea0accd8 100644
--- a/conf/inject_definitions.go
+++ b/conf/inject_definitions.go
@@ -9,13 +9,13 @@ import (
 
 func init() {
 	// Persistence
-	ir := utils.DefineSingleton(new(domain.ArtistIndexRepository), persistence.NewArtistIndexRepository)
-	pr := utils.DefineSingleton(new(domain.PropertyRepository), persistence.NewPropertyRepository)
-	fr := utils.DefineSingleton(new(domain.MediaFolderRepository), persistence.NewMediaFolderRepository)
-	ar := utils.DefineSingleton(new(domain.ArtistRepository), persistence.NewArtistRepository)
-	alr := utils.DefineSingleton(new(domain.AlbumRepository), persistence.NewAlbumRepository)
-	mr := utils.DefineSingleton(new(domain.MediaFileRepository), persistence.NewMediaFileRepository)
+	utils.DefineSingleton(new(domain.ArtistIndexRepository), persistence.NewArtistIndexRepository)
+	utils.DefineSingleton(new(domain.PropertyRepository), persistence.NewPropertyRepository)
+	utils.DefineSingleton(new(domain.MediaFolderRepository), persistence.NewMediaFolderRepository)
+	utils.DefineSingleton(new(domain.ArtistRepository), persistence.NewArtistRepository)
+	utils.DefineSingleton(new(domain.AlbumRepository), persistence.NewAlbumRepository)
+	utils.DefineSingleton(new(domain.MediaFileRepository), persistence.NewMediaFileRepository)
 
 	// Engine (Use cases)
-	utils.DefineSingleton(new(engine.Browser), engine.NewBrowser, pr, fr, ir, ar, alr, mr)
+	utils.DefineSingleton(new(engine.Browser), engine.NewBrowser)
 }
diff --git a/tests/init_tests.go b/tests/init_tests.go
index 0447fe387..e6929b7c7 100644
--- a/tests/init_tests.go
+++ b/tests/init_tests.go
@@ -1,11 +1,13 @@
 package tests
 
 import (
-	"github.com/astaxie/beego"
 	"os"
 	"path/filepath"
 	"runtime"
 	"testing"
+
+	"github.com/astaxie/beego"
+	"github.com/deluan/gosonic/utils"
 )
 
 func Init(t *testing.T, skipOnShort bool) {
@@ -21,4 +23,5 @@ func Init(t *testing.T, skipOnShort bool) {
 	if noLog != "" {
 		beego.SetLevel(beego.LevelError)
 	}
+	utils.Graph.Finalize()
 }
diff --git a/utils/graph.go b/utils/graph.go
index 18891db2f..b580f19bb 100644
--- a/utils/graph.go
+++ b/utils/graph.go
@@ -1,8 +1,9 @@
 package utils
 
 import (
-	"github.com/karlkfi/inject"
 	"reflect"
+
+	"github.com/karlkfi/inject"
 )
 
 var Graph inject.Graph
@@ -11,9 +12,9 @@ var (
 	definitions map[reflect.Type]interface{}
 )
 
-func DefineSingleton(ptr interface{}, constructor interface{}, args ...interface{}) interface{} {
+func DefineSingleton(ptr interface{}, constructor interface{}) interface{} {
 	typ := reflect.TypeOf(ptr)
-	provider := inject.NewProvider(constructor, args...)
+	provider := inject.NewAutoProvider(constructor)
 
 	if _, found := definitions[typ]; found {
 		ptr = definitions[typ]