Additional tests for resolving dependencies
Update comments