Moved to TestNG for unit tests