Minor test suite consistency fixes