DataList and Collection fix/unit-test