Support for test players.
Necessary changes.