Minor changes for code coverage, except ChessModel is only at 50%
coverage.