Switch historic data syntax to trig.
Syntax and test updates.