misc minor logging, usage and test fixes

switches some brittle/broken integration tests to integration,
and minor changes to fix #456 and #457