fixing commands and tests