separate and fix tests
adding test for result limit
remove custom escaping and add test