Merge pull request #533 from leider/master

separation of display concerns
some tests for the rendering