OP-421: Tests working in services layer… Further Progress: Converting doWithTransaction…closures from groovy to java…restructured code as well