OP-764 - moving test to the right  package