Better e2e tests coverage

[jvalkeal]

Now that work is ongoing with #646 it'd be really good to have better tests in samples to iron out bugs from parser rewrite.

[jvalkeal]

Marking this to backport so that when done we can compare 3.0.x.