[ci skip] Minor tests adjustments