Simplify test code

Change-Id: I65c3edc85ee8619c7e77cca7622e7025799bdcad