construct specific DR data structures rather than inheriting from SWF
adding test data and testing; bugfixed