Remove relative dependency resolution; Fix tests;