Fix unit-tests for the change Accept->Accepts