Add writer
Add values to test