WIP: add new tests