Fixed command and tests