Adapt contribute's kickstart to the new topics
Fix test