Group DependencyResolver set and specs

This makes the requires a little easier to read.