WIP: Fix test