Unit-tests improvements.