tests improvements.