WIP: Fix up existing tests