More test cleanup; removing hardcoded array indexing

Makes it easier to further constrain the results without assuming any
particular order in the output.

Signed-off-by: Jim Crossley <[email protected]>