Updated protocol in tests, added messages test