Made user-input player (TestPlayer1).
Fixed testWin.
Various cleanup, renamed a bunch of stuff