Continued testNG tests, improved code that does everything.