This is a follow up to commit 05df3d7aa4 addressing issues with excessive logging and adding a missing unit test. Change-Id: I827fa5dd813acbf1d478c64508f10c42d1460b4a
05df3d7aa4