refacotring the OPLogic unit test and move it to test package