Fix tests.
Remove useless option from CLI.