WIP: test fix