Update test-helpers. These now handle targeting

Signed-off-by: Eric Malm <emalm@pivotallabs.com>