Add commands and tests