[BUGFIX] Add missing initialisation in ResolveUtility
[TASK] Adjust tests