ensure all string-like variables are escaped

+ cosmetic changes to have all the test expression consistent