Removed class TestCommand.
Some restructurings for command line interface.