Refactor method names in tests
Fixed leaving protocol