More test suite faffing