first part of #5605 tests

I'm pushing this to get some more eyes on an
issue I'm seeing.
This code is NOT done nor is it ready for review.

Signed-off-by: Joe Buck <jbbuck@gmail.com>