Added test-code.  Commented out.  No functional changes.