Tweaks to the tests, along with a small refactor to the FileHistoryStore
Merge branch 'mbst-8930-refactor-radioplayer' into stage