test suite fixes for #32