add test generator
tidy up SFP schemata