Clean up, preparation for file content tests!