Removed old ProtocolTest
Some refactoring