Updated option output test and added argument groups. Minor code
cleaning and removal of some print statements.