Get closer to a working single Makefile with test support.