-be more agnostic of quotes here

Conflicts:
	test/engine/test_execute.py