Added missing files for CommandTester