And fix the broken test script while I'm there.