fixed drainTo bug that when collection is null , we lost the drained val...

...ues and some test corrections
Good spot