Switch asserts to TestNG style
remove more tests duplicated by MatrixTest