Resolves #11 - test failure on master due to race.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Merge branch 'fix_frenetic_resize_test' into fix_pumps_for_jenkins