adapted to new UF menu api
minor adjusts and ignoring some failing tests