Get rid of fngTabs
Modify tests