Starting work on new set of tests for fileclient.

Also, more integration testing for templates.