Merge "Correct fake V3 token responses"