Improve player and tests_player files