Refactor SpoofTest

Change-Id: I585c3b9ffa0fd7a01ca58b0a863a8a331eda640e