changes to Operation

changes to Operation
and a Test for Operation