Tweaked a few tests and TestNG annotation