Name merging conflict in tests
Merge branch 'Pistachitos' of https://github.com/mr-orange/Sick-Beard into Pistachitos