Fix testcases that used hardcoded String