WIP fix a handful of tests
WIP quick'n dirty resolve() twistification