better assertions in test
less aggressive caching, more correctness.  better logging
Merge pull request #835 from ifreecarve/2013-04-01_less_aggressive_caching

Addresses problem in SMOKE