Update to tests and variable processing
Test tidyup
Initial 'Variable Substitute'
More variable substution, tests and tidyups