More test reorganziation

Sorry about the reindent -- last time, I hope.
Tinker with how to get useful build targets
for "run tests" and "check statistics" in cmake.