Fix prefix test to include C-x
Update labeling test to match new labeling