runtime: wip: more tests passing.