Fix tests after behavior modification in file resolver