Add some more tests to narrow doen the FF3 issue