cleanup and refactoring; rewrite integration test using spring shell facilities
update tests and shorten logging output