Code review and topic tests speed improvements