Refactor some player tests