tests with escapes added, tests refactored - broken to smaller chunks