Improvements for testing.
Merge branch 'master' of github.com:mythagel/cxxcam