consolidate resolver creation logic

[yss14]

Motivation: At the moment, instance and test instance resolver creation logic s separated, often causing a painful and time intensive experience changing/adding new resolvers.

Acceptance Criteria:

• [ ] resolver creation logic is outfactored
• [ ] resolver creation logic is shared between instance and test instance setup