Fix test cases. Remove String.prototype manipulation

Fix testcases.