Cleans up protocol and tests