Nice cleanup. Also, I like the ability to enable/control more types of tests easily from the Makefile. What are the next steps for this patch?