Merge "Removes dependency on TestNG library." into udc-dev