Minor test enhancements for robustness