More explicit fix for toList, added a Unit Test