Add writer module with adjusted tests