And fixed a test (related to f172c4e)