WIP: add more tests