Handle lists of values (eg. album names) better
Updated unit tests