And now fix a broken test