Rename instrument constant
Add tests and implement the protocol a bit further