WIP: more tests passing