Tests improvements.