Fix test pollution and noise.

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