Fixes to player tests (passing all but 26)