Improving the protocol and trying to make the test suite work again