Cleaned up player test