Updated content test data. Refactored / improved templating of to-do and discussions