Updated CcGameBoard and GridUnitTest to match the develop branch