Factorization of code between services and minor unitary testing improvements. (Not finished, it is just a backup)