o Improved escaping
o Improved design
o Improved test concurrency