Added xjson support (json + javascript comments), and started adding unit tests