add dependency injection and folders for Tests