Wrap test in a class, changed Makefile, full test of keywords