Changes made to accommodate more commands in the connector and the test
client #25