fixed-up and added tests to MakeOrs()