Update test cases for the elvis operator; tweak parser utils