improve code coverage in tests

Change-Id: Ie7782422faa75607c284cf164cdf6a97861a481f