some unit tests adjustments