UT Refactor - Collections, complex types