Refactor test a bit in an attempt to make it less sensative to timing problems. 
1 file changed