Properly implement badge mocking
Merge pull request #40 from iHiD/badges2

Properly implement badge mocking