Only look for fji when we need it; reorg test data