fix for tap tests

Change-Id: Ic79cfdaf420cbf15a1aba6e30c821f35b726d0da