Fix test assertions that slipped when merging