Refactored tests for game logic
and, surprisingly, some fixes.