Remove diary_entry and diary_comment fixtures, and refactor tests.