WIP: add a few more tests