Workitem 7

Contains updates to DL Mocks and DL UT.