integration test 2168
logging fixes