Function now passes tests; takes variables containing quoted expressions