A couple more minor test improvements