Make server_option a callable function, to reduce globals

Updates acceptance test for #152 to not mess wit internals