Another try to get testling going w/o test code changes.