E2E Test maintenance

Change-Id: I4aad4cf873f8e4113681c588ccd81e0d70b5f305
Signed-off-by: Jeremy Ho <jujaga@gmail.com>