Clean up. Remove faulty short-circuti.
Add ConnectFour tests
Clean up demo