Fixed dependency resolution to work with test scope