Fix unit test and current player logic