WIP: Fix tests?