Fix for the one remaining functional UICatalog test

Please merge.