Add Player tests + fix exit and toggle