Made dependency changes to ensure nextplayer() works properly for test
cases.