Incorporates prefpane unit test fix.