Fixes the unittest failing 

* reintroduces the cancel-on-close behaviour in the mocked `CAF::FileWriter::close` that was modified in https://github.com/quattor/CAF/pull/74
* also fixes #35