A bit of refactoring and some more specs on championships