Be consistent in top-level names of tests
Added support for UTF-8 escape sequences