Add tests for the refactoring branch

Status Name Job ID Coverage
  Build
canceled build #767

 
  Test
canceled code_quality #769
allowed to fail

canceled test #768