20140408-2039 DWDT Added a couple more tests.