20140408-1330-DWLT Added more tests