Updated test data.  All existing executing tests now pass.  Also started
adding "shorten" support.