Add validation before running expressions + tests