migrate to testNG, slight improvements to tests