Started work on TestCommand