added a few unit tests/fixed escape issue