fixup! mattdrayer/server-api-merge: Additional changes to get tests passing