Merge "Move resolver tests to a separate translation unit"