New game logic and test

New game logic and test ongoing changes