Adding a 'make-safe' fn that escapes any embedded forms
Splitting the 'tests' out - should really make a test ns for these.