Unit tests adjustments.