Test cleanup

Signed-off-by: Casey McTaggart <cmctaggart@pivotallabs.com>