Add TODO and commented-out tests for wildcard keyword support