Fixed issue that hanged build, added FF tests