tidy up chid queries.  add non null constraints to meta protocol, remove
job_mapping - useless.  Clean up tests to accomidate constraints.