Moved TestCommandListener to its own file