Add null check to turn.addRoll; re-order methods
Add tests to TurnTest