Added tests, some pending
Fixed escaping of values (don't escape colon)