Code factoring, new tests in main()