Fix some more test suite stuff