[MAT-84] Remove some TestNG dependencies in main code.