Starting work on new set of tests for fileclient.

Also, more integration testing for templates.
Merge pull request #9132 from cachedout/file-client-tests

Starting work on new set of tests for fileclient.