Merge. Improved OthelloImpl and OthelloImplTest