Bugfix issue with stopping while currently playing
Add new testdata and fix tests to use new testdata