fix jop based on unit test migration