fixed smoke tests

These passed in a branch.  (whew)