Merge "Update Parsoid-only tests to reflect shortened typeof"