refactor tests to remove flakyness

Signed-off-by: Alex Jackson <ajackson@pivotallabs.com>