re #145 - resolves the mentioned test failures when run against Winamp