server_type -> exposed_protocol
Test changes and other random stuff