Fixed function id handling and improved ut fail handling