Can we make NO_UNITTESTS it go away now?  What is preventing it?