Test display output

Adds tests of display tag output and corrects error in test of include tag output. Also factors display output generation into separate functions for the two player types.