more attempts at cleaning up smoke tests
fix ordering issue
ensure we use multi processor safe fields
fixed smoke tests

These passed in a branch.  (whew)
Merge remote-tracking branch 'origin/master' into pjsm/2.0