Added base service and junit tests