refactored tests and activePlayer