Refactoring messages
Simplified messages
Fix remaining tests
Fix unit tests
Fix test
Merge branch 'feat_protocol'

Simplified protocol