Slight code reduction
Add dependency resolution
Add test for dep resolution