Removing dams_datastream, updating tests (DHH-184)