Merge "Fixing TaplTests" into udc-dev