TestNG pulls in JUnit, and some tests use a mixture of assertions

[detouched]

TestNG version used has JUnit as direct dependencies, and test classes use JUnit's assertions.

This is quite fragile and prevents migration to a newer TestNG library.