Small fixes and tests
Displaying year and grouping text in treemap