Don't use Javascript to do.replace()
Formatting improvement for webclient testcases