Clean-up and code coverage improvements

Change-Id: I7aec8807e1f01a4f27525817ae0caf1bdd0d9663