Added missing CommandHandlerTest
More cleanup...
...