Address CR feedback / adding logic to log the input name if available and unit test