Couple of minor test improvements