fixed command issues
fixed test cases