Add tests for presenters and articles
Apply review comments