Add FSG generation to test run