Fix unit test assertion
Merge branch 'file_saving'