adding tests in main for each concerned class, reorganizing visibility of methods