wip: Update tests