added test escaping utility class
added TODOs and fixed imports

fixed imports and added TODO