Update commandline
FIX tests