update more test cases to use literal-at-pump