Operage refactoring (lib)
Operation and Service tests refactoring