And fixed the broken test again