Added Organization element type, starting on more sophisticated test case