refactor test attempting to remove flakyness

Signed-off-by: Chris Wang <cwang@pivotallabs.com>