Add missing mock method for xml writer tests
Fix FileAssessmbler test mocking
More fixes for mocking
Merge pull request #962 from tommygnr/fix-tests

Tidying up some tests