ServerTests.Command() update
Merge remote-tracking branch 'origin/master'