Minor test optimizations.