Fixes to satisfy remaining resolver unit tests