Regression tests for 679

The previous changes I made to block selection tonight also fixed an
existing issue.  Added some unit tests and closing out the bug

closes #679