Fix some commands and tests.