WIP - Fixup failing tests