Added step operation & test