Improve error messages. Uncomment protocol tests.