Fix failing tests (apparently due to updates to server)