Reduce hasData per @gibson042 review notes.

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Avoid potential for breakage if test suite is run in a frame

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>