Unit tests improvements.