Fix randomly failing tests

This is sort of theoretical, but may resolve the problems we've been having with the tight_bbox tests ocassionally failing.