Minor test refinements