Adding class tags to HTML output format
Test improvements

Config and CSV were incorrectly swapped
Now tests CSV and HTML output