minor test improvements