Writer unit test enhancements