categories included in sinon fake server + small refactors