fixed won? so it doesn't wreck state of game
strengthened tests