Add live parsing of variables.
Cleaning up tests.