Update tests.
Simplify API for nodes htat have both a block and a semicolon token.