Get rid of compact/extract in test

I think compact/extract are unclear & my IDE agrees with lots
of squigly red lines for variables he has no idea where they
come from.

Change-Id: Ie87b684a534c84814ebdbe48d9cae55deee762de
Merge "Get rid of compact/extract in test"