small test suite fixes