Operator changed to scala objects
cleanup and more testing for Constant / Cn