[CLC-2368] Fix tests to match up to pre-recorded data
Merge pull request #1550 from yuhunglin/CLC-2368

[CLC-2368] Fix tests to match up to pre-recorded data