#575 updated tests to support both basic and timestamp verification.