Fix named instances are ignored when sorting dependencies.
Clean up some code
add resolver test cases