WIP: fix tests