WIP: fix test