Modify OrionRestHandler in order it is easier to test