addresses issues #5 & #4 from the dependency standpoint of test directives
fixes #4 for client.php & query files, brings client class into specs of #5