Added commands and test