Minor changes to get frame test working.