Code changes for returning List of values test