added the org_name attribute into the "fn" field of the organisation's vcard. also made use of the JSONAssert functionality to more robustly check the results of serialization in tests.