Add set to test-harness
Align definitions in makefile
Shrunk Makefile