DRY up test code
Remove dead code
Test and refactor CSV renderer