Cosmetic changes to CLI test file and Main class