fix tests,  match fantasy-land, clean out functions that don't make sense.