Unifies command line arguments. Fixes tests.