test: enable force inclusion, re-enable fi e2e and add fi benchmarks

test: enable force inclusion, re-enable fi e2e and add fi benchmarks #7416