few more minor corrections and unit test updates
removing debug log statement