Merge "assertEquals is deprecated, use assertEqual"