WIP -- most tests running, a few commented out, sometimes a segv on exit