Code review and topic tests speed improvements
Merge pull request #38 from DentonA/codereview

Code review and topic tests speed improvements