Should also update demo script.
Removing steps. and with. from remaining tests and examples.