Updated row printing class to use simpler method to generate headings/values. Added tests