Update to tests and variable processing