Cleaned up main. Next add more tests for the new methods, out all of the
test methods in the same class.