Updated E2E Test suite

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