All tests passing

All tests are passing again.  Verified and added a regression test to
ensure that #903 is fixed.

There is still more work to do here.  While the block selection code is
paged into my brain I will take care of a few other items.

closes #903