More tests improvements.