Actually respect this.timestamp

This also includes a fix for substitutions.
Update tests