Fix tests, continue prep for literal/identifier matching