Fixup for r216763. Add a driver test.