[Tests Suite] CR fixes:
 - a bit more correct message for test assertion;
 - avoid code duplication.