improved tests
add class to generate Dsr easily, minor corrections/improvements