Couldn't stand the new name policy, so I change to _tst (for now).  This still makes cmake unhappy, so maybe I'll fix it in some other way.