Added commands and more test cases