reapply test SEBA-108 patches

Change-Id: Ic0ed48d4882e23e092d10becae8f2528c412ce15
1 file changed