Revert back to writer and improve test

[PaoloLeonard]

Pull Request

Description

Please include a summary of the change and which issue is fixed. Also include relevant motivation and context.

Fixes # (issue)

Type of change

• Bug fix
• New feature
• Breaking change
• Documentation update

Checklist

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes
• Any dependent changes have been merged and published in downstream modules