Tests were broken due to an API changing. The code used in Synapse
proper should be compatible with both versions already.