Added missing declarations to test CommandGateway