Revert "clean up testng dependencies in our subprojects (using 6.8.1)"

This reverts commit d5f096e2b423e7d87a7bfa86234c302ecce42962.
Revert "clean up hamcrest dependencies in our subprojects"

This reverts commit 66f5a6b34b2448bbdcdb63466a7d6879919ccae1.