lint, clean up comments
rework integration test structure a bit so we can get coverage numbers