Updates to encounter.history()

Also - suppress MARK messages, add counter to test_samples()