refactor player tests/factory