Hi Philippe,

Feel free to change your proposed changes. I might also make sense to
move over some of the orion tests.

I've checked in Magritte-Json-NickAger.10 and I've modified Orion, but couldn't check it in (permission issue) so I've attached my changes.

Cheers

Nick