Spice up the Makefile a bit.
Fix test target for now.