bump up timeouts in test in response to intermittent jenkins test failure
minor fixes and comments related to logging and deprecation