minor modify (+ tests updated)