Add tests utilizing short command-line options