Adds Tests and SaveRestore stuff for scrubber and player, fixes the mistakes.