Adding AsEnumerableOrDefault with tests. removing unneeded deps