Switched to JUnit (test runtime from 27seconds with TestNG to 3seconds
with JUnit). Minor cleanups.