WIP: more tests