Test display output

Adds tests for display output and refactors output routines for each player type. Now rebased onto upstream master.