Clarify why 'next_marker_by_timestamp' requires a 'marker' parameter
Use SynchronousTestcase in test_history
Fix broken test where two timestamps were in the same dictionary