Merge "Remove oldTablePrefix from ParserTest"