logging and unit test updates