WIP: add some more tests