Improves the code coverage for the present tests where possible. Change-Id: I8971ba2ed775dcd772622acea3fed4ebaa177ad7