Merge "Adding more DL Manager tests." into gingerbread