Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread