Tests: minor test improvements.