Making sure only ScalDI is used
Fixed unit tests