refactored CommandMatch and CommandMatchTest

1. refactored CommandMatch and CommandMatchTest
2. mark author