20140513-0738-DWDT Added a few more tests, and corrected some other failed tests