#POULPE-483 tests added + some minor corrections