Removing unused test helpers

Change-Id: I70e57a8dde9723b8a6123c2f982ed664f7070a4f