Added handling of escaped quotes, added more tests #1