Minor test improvements.