Template Resolver / tests / other test fixes