I finally figured out what was really supposed to be happening
in part of the code and changed it so that it would properly
use cell bounds if they were precomputed.  Also improved the test.

Change-Id: I3831a2dff6b1128669e4298851dea366222f64fb