Remove fisher, fix generic model generation, update tests